Change sepa config + some improvements