Pushing missing code as per latest code of context switch