Improve lang tool