Headlamp and lamp upgrades