updated setup a little bit