added language handling per number