Improve reader