More changes according to the comments by Nori and Tom