Minor update for context switch