changed typedefs