Updated encoding...