Add HGR, update B9 to not change basemass, TT for more liters