wrote more, rearanged