First set of changes from Markus und Christian
More changes from Markus und Christian