Changed some setup code