more replacement and fix the record analysis of recover