updates from Markus
conflict fix