some improvements on recovery