some more edits --> version to Prof. Weber