Re-build part 3