Modifications done following Ariel's comments