RE: Verify and Rebuild functionality