Polishing the Diamond