F21/F22 mass rebuild