+ moved stuff to a new type info struct