closing #6 and #7