catalogs working, some optimisations