added some of setup and config