Better language tracking