changes in the typedefs