Zhang

@panhartstuff Work like a charm here with the legacy reader. But we need support for the new reader since the old one maybe be removed later.