Ensuring smooth language changes for 2.0