Like in the other pull request, this is missing the localization parts.