last changes from Prof. Weber
add changes from Guido