Rearanged some stuff