little changes with LANGUAGE_CODE