improved selection of langauge