Changed around setup a little bit