Latest version ready to be translated

Includes Charlie's commit