made changes according to received comments