Made Translation switching system better