Add and Finish 8.7 and 8.8