Completed point 5 and 6