- added more setup stuff