Rebuild part 2