rework of the lang management