Pulling stuff from holger
conflict resolved