Rebuilt to match production