Completed assignment 7 and  8 revised