Finish #7 and #6