removed custom types changed named to typeof