To update jim's branch with localizations