Make library much better: +1 !!!