Issue #27 - Backup Polishing