merged joergs request ?