restructured for new vehicle content