more work updating for new libraries