more trying to work on #8