changed loading of setup and initial data