Updates according to the comments by Tom and Lars