Completed point 7 and 8