Updating: reorganizing a bit