some new changes to setup for catalog iteration