Finished #6 and #7