changed setup a little