made changes according to review comments