Updating: some reorganizing