Changes to context switch