Changes with the comments by Nori, Tom and Lars