Adaptation of rules 2017-2020