Improved lib