implement comments from Eliot