Adapted to the current status of the Tabletop libraries.