changed the name of type1 and type2