New formulas; fill in some h formulas