rework reply checking preparing for indexes