Version 2 in-place

Page: 23 of 25 (92%)