modified in accord to the issues of last week