anchor.diff:        OtherState%FirstPass(i,j)   = .false.
    
            ! If we are currently tracking a vortex, or we are in the stall region, increment tau_V
  -      if (p%UAMod == 2) then    !Added specific logic for UAMod=2 
  +      if (p%UAMod == 2) then    !Added specific logic for UAMod=2
  +      
            if ( (.NOT.LESF .AND. .NOT.VRTX) .OR. & 
                 (.NOT.TESF .AND. xd%tau_V(i,j)<0.0001) .OR.& 
                 (.NOT.TESF .AND. xd%tau_V(i,j) + 2.0_ReKi*p%dt*u%U/p%c(i,j) > 2.*T_VL) ) then 
               xd%tau_V(i,j)=0.0 
            else 
  -         xd%tau_V(i,j) = xd%tau_V(i,j) + 2.0_ReKi*p%dt*u%U / p%c(i,j)
  +            xd%tau_V(i,j) = xd%tau_V(i,j) + 2.0_ReKi*p%dt*u%U / p%c(i,j)
               if (( xd%tau_V(i,j) >= (T_VL + T_sh) ) .and. TESF)  then !.and. (TESF) RRD added  
                  xd%tau_V(i,j) = xd%tau_V(i,j)-(T_VL + T_sh) 
                  ! LESF=.FALSE. !also added this 
               end if 
  -      end if
  -      else 
  +         endif 
  +         
  +      else
            if ( xd%tau_V(i,j) > 0.0 .or. LESF ) then
               xd%tau_V(i,j) = xd%tau_V(i,j) + 2.0_ReKi*p%dt*u%U / p%c(i,j)
  -      endif
  +         end if
         
   !BJJ: check this logic because it's not clear what UAMod=2 should be doing with this merge conflict
   
  -         ! If we a have been tracking a vortex and 1) it is now past the chord [T_VL] and 2) we have gone beyond the next shedding period [T_sh], and 
  -         !   3) we are continuing the flow serparation, we will shed the existing vortex so that we can create a new one at the leading edge
  -      if (( xd%tau_V(i,j) >= (T_VL + T_sh) ) .and. TESF)  then !.and. (TESF) RRD added
  -         xd%tau_V(i,j)          = 0.0_ReKi
  -      end if
  +            ! If we a have been tracking a vortex and 1) it is now past the chord [T_VL] and 2) we have gone beyond the next shedding period [T_sh], and 
  +            !   3) we are continuing the flow serparation, we will shed the existing vortex so that we can create a new one at the leading edge
  +         if (( xd%tau_V(i,j) >= (T_VL + T_sh) ) .and. TESF)  then !.and. (TESF) RRD added
  +            xd%tau_V(i,j)          = 0.0_ReKi
  +         end if
         end if
         
   #ifdef UA_OUTS
  
positive.code:       ! This is the default value for sigma3 which effects T_V = T_V0 / sigma3
     OtherState%sigma3(i,j) = 1.0_ReKi
     
        if (p%UAMod /= 2) then  !this is not applied for UAMod=2, Tv has always the same value
        ! Identify where the vortex is located relative to the chord 
     
        ! 1) Is the vortex past the trailing edge, but less than 2 chords?
  
negative.code:       
        ! These quantities are needed for the update state calculations, but are then updated themselves based on the logic which follows
     T_f           = T_f0 / OtherState%sigma1(i,j)       ! Eqn 1.37
     T_fc          = T_f0 / OtherState%sigma1c(i,j)      ! NOTE: Added equations for time constants of fc (for Cc) and fm (for Cm) with UAMod=2
     T_fm          = T_f0 / OtherState%sigma1m(i,j)
     T_V           = T_V0 / OtherState%sigma3(i,j)       ! Eqn 1.48
     
      
     ! Compute Kq  using Eqn 1.9  with time-shifted q s
  #ifdef TEST_THEORY
     Kq            = ( q_f_cur  - q_f_minus1 ) / p%dt
  