minor rearanging