Add and Finish 6.16