Katharina's code

Modified