The diff is hard to read because I removed the unnecessary method related to mkt but the interesting addition is right here with the utf-8 decoding. That's the only thing I changed.