Livrary complete rewrote