Done with homework 6 and 7