typedefs update