merging Georg's revision