new code that takes into account different mock catalogs