catalog setup changed
some improvements