updated to match changes to header files