Use updated reader function