changed setup a bit