almost done with intergrating new AH format