Added changes christophstrobl