Rearanged things a bit