working on #5 and #6