I did this last week. Here's something, just rub the headlights back with 1500wet then mask the surrounds then use the buffer with cutters on a lambswool buff. Polish if needed. Takes about 5 mins