changes to reflect new typedefs addition