Broke away from gentype.h
Updating