Add and Finish 6.18