- added some changes to way language is changed