modifications according to review comments