Rebuild and Restore

Rebuild and Restore