General lib upgrade