Add raw pass recovery