typedefs changed