rearanged some stuff