Ken's 2nd attempt at merging