added new h2 code
fix for confilct
added new h2 code
Merge branch 'toms_yet_another_feature'
fixed merge conflict