added all TYPEs