Undertow-related polishing