changes from Chad to address library issues