aligned to new rovereto rules