Rewritten entire library