Changed some stuff with the whole setup thing.