Update by Markus Reinhard as part of PA 2