Improved library