Improved the library