VSR & HHC logic adjustment