Rebuild from scratch