Added stuff for hm2