Rewrote the HTML based reader