Rewrite of Entire library