made changes according to the suggestions