Removed unnecessary context switching