Changes according to the new comments by Nori