#71 Improvement of the priority setting.