Add and Finish 12.1, 12.7, 12.11