final changes on language change

final changes on language change