[PATCH 04/13] New remediation