added Type2 but not type2_aux
changed type1 to include all contraction
changed type1 to include all