changes by Andreas