Cleaned up and added recovery