continuing work on issue 107