Rewrote reading strategy
Moved code