first update based on Christoph's comments