Updated encoding etc.