Completed revised assignment 7 and 8