Is it just lines 437 - 448 here that you wanted merged?