changes according to comments from Sampriti