This should use the newer style library.