Work for Week6 and Week7