rearanging for updates