New partners and encoding fix