2nd attempt at a merge