- changes by Markus Koehler