Data recovery 1862

For Sam to send to review.