changed setup some