Completed question 5 and question 7