structure changes and few other changes to aufgabe2