jh - finished merge