diff --git a/lib_enc/ivas_core_pre_proc_front_fx.c b/lib_enc/ivas_core_pre_proc_front_fx.c
index 4ff34272f8282ae8a4036c76bd652d41a97da2d1..0eb6d1887000dae2413c69c169fdcfe76c23bf1d 100644
--- a/lib_enc/ivas_core_pre_proc_front_fx.c
+++ b/lib_enc/ivas_core_pre_proc_front_fx.c
@@ -87,7 +87,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*/
@@ -149,26 +149,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];
@@ -251,41 +231,21 @@ 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_no_sat( 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_no_sat( 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
-        in_buff_temp = hSCE->hCoreCoder[n]->input32_fx;
-        in_q_temp = hSCE->hCoreCoder[n]->q_inp32;
+    in_buff_temp = hSCE->hCoreCoder[n]->input32_fx;
+    in_q_temp = hSCE->hCoreCoder[n]->q_inp32;
 #endif
-    }
-    ELSE
-    {
-        Copy_Scale_sig_16_32_no_sat( 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_no_sat( 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
-    }
+
 
 #ifdef DEBUG_MODE_INFO
     if ( !( hCPE != NULL && hCPE->hStereoTD != NULL && ch_idx > 0 ) )
@@ -307,7 +267,7 @@ ivas_error pre_proc_front_ivas_fx(
     }
     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();
@@ -456,11 +416,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 */
 
@@ -471,15 +426,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) */
@@ -504,12 +459,18 @@ 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 ) )
     {
@@ -530,16 +491,17 @@ ivas_error pre_proc_front_ivas_fx(
      * (if not available from downsampled DMX)
      *----------------------------------------------------------------*/
 
+    Scale_sig( st->mem_decim_fx, 2 * L_FILT_MAX, sub( st->q_inp, Q_inp_const ) ); /* 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*/
+        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 ); /* st->q_inp */
+        Scale_sig( new_inp_12k8_fx, new_inp_out_size, negate( Q_new_inp ) );                                                                                                                /* scaling back to st->q_inp*/
 
         Copy( st->mem_decim_fx, 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 ) )
     {
@@ -550,27 +512,38 @@ ivas_error pre_proc_front_ivas_fx(
             Word16 length_inp = NS2SA_FX2( input_Fs, 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, 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, ( st->max_bwidth == NB ), &Q_new_inp, &mem_decim_size ); /* st->q_inp */
+        Copy( st->mem_decim_fx, 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_FX2( 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, 2 * NS2SA_FX2( input_Fs, DELAY_FIR_RESAMPL_NS ) ); /* st->q_inp */
+        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 ) );
+        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 ) )
+    {
+        Scale_sig( 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) */
@@ -581,15 +554,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 */
     }
 
     /*------------------------------------------------------------------*
@@ -604,14 +577,18 @@ ivas_error pre_proc_front_ivas_fx(
     move16();
 
 
+    st->mem_preemph_fx = shl_sat( st->mem_preemph_fx, sub( st->q_inp, -1 ) ); /*st->q_inp*/
+    move16();
+    st->mem_preemph_DFT_fx = shl_sat( st->mem_preemph_DFT_fx, sub( st->q_inp, -1 ) ); /*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 = st->mem_preemph_DFT_fx; /* 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 = 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 );
@@ -632,9 +609,9 @@ 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 = st->mem_preemph_DFT_fx; /* 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 );
                 preemp_start_idx = new_inp_12k8_fx - L_MEM_RECALC_12K8 - ( STEREO_DFT_OVL_12k8 - L_MEM_RECALC_12K8 - L_FILT );
@@ -643,7 +620,7 @@ ivas_error pre_proc_front_ivas_fx(
                 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 = old_inp_12k8_fx[L_INP_MEM - STEREO_DFT_OVL_12k8 + L_FRAME - 1]; /* st->q_inp */
             move16();
         }
 
@@ -662,7 +639,7 @@ ivas_error pre_proc_front_ivas_fx(
 
         // 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) */
+        dummy_fx = st->mem_preemph_fx; /* 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 );
@@ -692,12 +669,15 @@ ivas_error pre_proc_front_ivas_fx(
         preemp_len = L_FRAME + L_FILT;
         move16();
     }
+    st->mem_preemph_fx = shl_sat( st->mem_preemph_fx, 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, sub( -1, st->q_inp ) ); /*Q(-1)*/
+    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 );
@@ -720,12 +700,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();
@@ -870,11 +850,10 @@ ivas_error pre_proc_front_ivas_fx(
     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 );
     }
 
 
@@ -1156,10 +1135,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 */
@@ -1183,7 +1160,7 @@ ivas_error pre_proc_front_ivas_fx(
     }
 
     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 );
+                      INT_FS_12k8, i, *Q_new, Q_r );
 
     FOR( Word16 idx = 0; idx < M + 1; idx++ )
     {
@@ -1223,6 +1200,9 @@ ivas_error pre_proc_front_ivas_fx(
     st->mem_wsp_q = *Q_new;
     move16();
     move16();
+    scale_sig( old_wsp_fx, L_WSP_MEM, sub( *Q_new, *q_old_wsp ) );
+    *q_old_wsp = *Q_new;
+    move16();
 
     ivas_find_wsp_fx( L_FRAME, L_SUBFR, NB_SUBFR, A_fx, Aw_fx, inp_12k8_fx, TILT_FAC_FX, wsp_fx, &st->mem_wsp_fx, GAMMA1, L_LOOK_12k8 );
 
@@ -1253,6 +1233,7 @@ ivas_error pre_proc_front_ivas_fx(
     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 ) );
 
@@ -1616,12 +1597,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;
@@ -1632,6 +1607,12 @@ ivas_error pre_proc_front_ivas_fx(
             move16();
             IF( flag_16k_smc )
             {
+                Scale_sig( st->input_fx - input_frame, input_frame_full, sub( -1, st->q_inp ) ); /* Q(-1) */
+                st->q_inp = -1;
+                move16();
+                st->q_old_inp = -1;
+                move16();
+
                 Word16 Q_old_inp_16k = -1;
                 move16();
 
@@ -1678,7 +1659,7 @@ ivas_error pre_proc_front_ivas_fx(
                 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 */
 
@@ -1769,9 +1750,15 @@ ivas_error pre_proc_front_ivas_fx(
     st->exp_old_inp_12k8 = sub( Q15, add( *Q_new, shift ) );
     move16();
 
+    Scale_sig( st->input_fx - input_frame, input_frame_full, sub( -1, st->q_inp ) );
+    st->q_inp = -1;
+    move16();
+    st->q_old_inp = -1;
+    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 );
diff --git a/lib_enc/ivas_cpe_enc_fx.c b/lib_enc/ivas_cpe_enc_fx.c
index 72d5d89e83bf9ae264c1b18d68cfdcdc8860d6e6..4e7706bafdf4ff23bd5e540dfb6f6f5b84fe66ca 100644
--- a/lib_enc/ivas_cpe_enc_fx.c
+++ b/lib_enc/ivas_cpe_enc_fx.c
@@ -216,30 +216,29 @@ ivas_error ivas_cpe_enc_fx(
 #endif
     }
 
-    Copy32( data_fx_ch0, sts[0]->input32_fx, input_frame ); // Q(q_data_fx)
-    sts[0]->q_inp32 = q_data_fx;
+    Word16 Q_min = s_min( q_data_fx, add( sts[0]->q_inp32, L_norm_arr( sts[0]->input32_fx - input_frame, input_frame ) ) );
+    scale_sig32( sts[0]->input32_fx - input_frame, input_frame, sub( Q_min, sts[0]->q_inp32 ) );
+    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();
+
     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 );
-    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;
+        Q_min = s_min( q_data_fx, add( sts[1]->q_inp32, L_norm_arr( sts[1]->input32_fx - input_frame, input_frame ) ) );
+        scale_sig32( sts[1]->input32_fx - input_frame, input_frame, sub( Q_min, sts[1]->q_inp32 ) );
+        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();
 
         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 );
-        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();
     }
 
@@ -369,26 +368,8 @@ ivas_error ivas_cpe_enc_fx(
     /*----------------------------------------------------------------*
      * Set TD stereo parameters
      *----------------------------------------------------------------*/
-    Copy_Scale_sig_16_32_no_sat( sts[1]->input_fx, sts[1]->input32_fx, input_frame, sub( Q11, sts[1]->q_inp ) ); /* Q11 */
-    Copy_Scale_sig_16_32_no_sat( 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;
     }
@@ -397,7 +378,7 @@ ivas_error ivas_cpe_enc_fx(
     /*----------------------------------------------------------------*
      * Resets/updates in case of stereo switching
      *----------------------------------------------------------------*/
-    shift = norm_arr( sts[1]->old_input_signal_fx, input_frame );
+    Word16 shift = norm_arr( 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();
@@ -741,6 +722,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;
@@ -831,6 +814,9 @@ ivas_error ivas_cpe_enc_fx(
         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_inp32 ) ); // scaling initial part of the input buffer
+        sts[0]->q_inp32 = Q15;
+        move16();
 
         // Normalise the input buffer from Q15
         Word16 input_norm, q_inp32, common_q, fir_delay_len;
@@ -890,6 +876,9 @@ ivas_error ivas_cpe_enc_fx(
         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
@@ -1232,6 +1221,9 @@ ivas_error ivas_cpe_enc_fx(
             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();
+            Copy_Scale_sig_16_32_no_sat( sts[n]->input_fx - input_frame, sts[n]->input32_fx - input_frame, input_frame, 16 ); // duplicating the data for input32_fx
+            sts[n]->q_inp32 = add( Q_orig_inp[n], 16 );
+            move16();
         }
     }
     ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_DFT ) )
@@ -1239,6 +1231,7 @@ 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]->input32_fx - input_frame, input_frame ); /* st->q_inp32 */
     }
     ELSE IF( st_ivas->hMCT == NULL ) /* note: in MCT, input buffers are updated later in ivas_mct_enc() */
     {
@@ -1248,6 +1241,7 @@ 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]->input32_fx - input_frame, input_frame ); /* st->q_inp32 */
         }
     }
 
diff --git a/lib_enc/ivas_ism_enc_fx.c b/lib_enc/ivas_ism_enc_fx.c
index 7f9962098f94c66270bbcd1b6cfa274b99b5b27f..81c9e01ef8818e5f3d1976b93dd791b99b9966a1 100644
--- a/lib_enc/ivas_ism_enc_fx.c
+++ b/lib_enc/ivas_ism_enc_fx.c
@@ -165,10 +165,14 @@ 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 ) );
+        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;
@@ -275,16 +279,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_no_sat( 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 )
     {
@@ -480,6 +474,7 @@ 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->input32_fx - input_frame, input_frame ); /* st->q_inp32 */
 
         hSCE->last_element_brate = hSCE->element_brate; /* Q0 */
         move32();
diff --git a/lib_enc/ivas_sce_enc_fx.c b/lib_enc/ivas_sce_enc_fx.c
index b2e0e9c694da4958991e30624b7881e82742f447..f1631ba4f94ed75cac2b1a9761763e13f61661c7 100644
--- a/lib_enc/ivas_sce_enc_fx.c
+++ b/lib_enc/ivas_sce_enc_fx.c
@@ -122,10 +122,14 @@ ivas_error ivas_sce_enc_fx(
 
     set16_zero_fx( old_inp_12k8_fx[0], L_INP_12k8 );
 
-    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 ) );
+    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();
 
@@ -362,6 +366,7 @@ 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->input32_fx - input_frame, input_frame ); /* st->q_inp32 */
     hSCE->last_element_brate = hSCE->element_brate;
     move32();
 
diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c
index b9f47136fe905b8d5b3f281ff656b5f6a21633e6..63c0d5d5447b1d6dfb04796ff297998cddd7aec6 100644
--- a/lib_enc/speech_music_classif_fx.c
+++ b/lib_enc/speech_music_classif_fx.c
@@ -2948,11 +2948,11 @@ void ivas_smc_mode_selection_fx(
     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 );
@@ -2969,11 +2969,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) */