polarity fix
Refactor to SAGA