redid entire library mapping