Updated encoding 2