working on #7 and #8