Changes made according to the comments by Nori and Dima