More concordance context switch

More concordance context