reordered to just keep the cataloging functions