penultimate changes from comments-1