Rebuild with v1