setup updated
Separated hosts setup