JH - merging
jh - more merge