working on #10 and #12