new approach (RCUR) https://github.com/Project60/sepa_dd/issues/215 - minor improvements / fixes