Finished porting to H2