New version based on review by Johannes.