Trying to improve librairies